Solving conflict on a smaller scale