resolve conflict Archives - Fichte & Co