Resovled merge conflict in comments