Addded git merge to master