add comments
Fix conflict in macro.clj