merge: save merge state earlier