Merge rules
linter fixes