Remove block duplication from merge conflict