changed files and fixing lint errors