Merge all changes from local branch to master