Debug helpers, enhanced conflict resolution