fix cinflict when do pull and push
fix conflict when do automarge