Merging the dev and master branch manually