git conflict
branch to orign