removed content from merge conflict