Conflict resolution in collaborative facility design