removing accidently commited merge files