conflict resolution
42 following