fix lint warning
merge master