minor conflicts