conflict resolution function behaving as expected. next, add player discrimination.
now with ugly-ass custom divs.
mobile units now display red if they don't belong to the logged in user, and green if they do.