commit before final phase1 merge