territory rendering
resolved conflict