create defns, they pr-str better
fix merge issue