Merge mybranch with squash