create comment code hide/show logic
fix merge conflict