Bad commit/push during resolution of Conflict