JBTM-1691 Don't attempt to auto merge the conflicts
JBTM-1691 Remove force (-f) from the reccomended commands
JBTM-1670 Use combine.children append instead of override
Revert "https://issues.jboss.org/browse/JBTM-1742"

This reverts commit 2098221c904dc77eeede0cd2d7742d88d91a41e4.
Minor typo.
https://issues.jboss.org/browse/JBTM-1742
JBTM-1745 Bind the emma goal to the test phase when the codeCoverage profile is activated
[JBTM-1171] Log sql exception for one phase resources
https://issues.jboss.org/browse/JBTM-1758
JBTM-1016 Add rulecheck-maven-plugin to check byteman script rules