removed line from merge conflicts