commit :  push immediately to origin
fixed conflict before merge