View after removing merge conflict