Added changes in README to be fetched by remote.
Change settings.py looking for conflicts.