Title: Conflict resolution pack 2