Add the ability to optionally merge automatically inferred rules with manual rules

Add the ability to optionally merge automatically inferred rules with manual rules #490