removing merge problems