Trying git merge
Git merging