remove unwanted changes from merge