merge

[Shamya]

git checkout master
git merge <branch>          %conflict reolution
git merge --abort