Linting and merge with amet finished