Resident conflict resolution