Fix merging mistakes :(
Fixed docotr/mayor end game condition