line branch
hungry
git commit -m hungry
git status
conflict solved