All engines are set up with a basic configuration
Resolved conflicts