Fixes merging to and pushing to master