Remove content from previous merge conflict