Fixed subcomment merge conflicts