merging
git commit -am merging
git commit -am merging