Remove a conflict made in the last push.