merge comments working