conflict resolution tricks