Merge conflicts; comments working for posts & reviews