merge conflict; province order test bugfix