Conflict resolution macros