Trying to Github merge the master branch into the dev branch