git conflict
branch to orign
another commit