removed last line from merge conflict