fix merge conflict

README.md

 $ pip install -r requirements.txt
 $ source env.sh
 $ ./manage.py migrate
+$ ./manage.py collectstatic
 $ ./manage.py createsuperuser
 $ ./manage.py runserver
 ```