playing with git
merge conflict resolved