Merge scratch with master branch