Fix cpplint
Merge conflict