Fix lint warnings
merge