With merging comment done