Merge configurations and add prod.conf