recommit
resolve confilict