Replace comment
Resolve merge conflict