removed conflict messages from merge

removed conflict messages from merge