Merging branch and commit work into master