Fix move lint and diff to top