fixing settings file.  allowed hosts was missing
fixing merge conflict