Rewrite
Merge origin/master