add comment
fix js for comments
fix merge
fix merge