remove line left over from merge conflict