Adding a check for display in configuration file
Fixing X merge vs override