Remove previous merge conflict files