Opps, forgot to save file after removing conflict markers.