Changed a macro
Fixed merge conflict