added land ownership highlighting
conflict resolution, hopefully w/o bin