Fixed workflow for comments as well.
Fixed conflict.