2 Commits (fix-style-rule-merge)