what is property conflict resolution