Chapter 2150 - Resolve Conflicts