replacing conflicting macros