minor lint fixes
Fixed merge conflict