Remove conflicted portion of last commit