conflict resolution... keeping local