Remove auto adding options as config when adding an instance without a config
Fix conflicts