clean up to allow pull/merge