Fixed merge, added comment intent code

We need to stop changing so much as everything breaks and has to be
fixed again.