Pull from master instead of relying on a setup merge branch.