removing merge error