chore(merge): fix merge issues with readme and Comments.js