Removed merge linting