Test prompting to finish merge
Make it actually do stuff
PR #1. Merge branch origin/merge_pull_changes into master.