scripts/lint/lint-results.txt merge=theirs