updating stan-pr make target so it automatically merges

Hopefully this fixes some of the merge failures on Jenkins.