git prune-branches
git merge --no-edit
Merge with master