[Quest #3] Conflict Resolution