removing merge conflit