Don't pick the wrong side of the merge or your save game might be completely broken 40 hours from now!