removed merge conflict heads