Added the ability to merge in your own autocomplete options, under the key 'autocomplete'
fix conflit