Trying to merge branch to master