define a few macros related to merge conflicts