Clean up
Merge origin/master