just commit
solve coflict