define a few macros and styles for  merge conflicts