fix macro
merge