Merge my change in comment