Merging project into master and working directly on the master branch