After a merge mess