Conflicts: pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexParserVisitorAdapter.java pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java