conflict resolution housing society