Remove merge conflict from view.