Removed some lines

removed conflict string