'Already up to date' error when merging dev into master. so manually
pushing to master