Git ship merge master before squash merging

Squash merge should no longer error.