config.py edited online with Bitbucket
fixed config.py conflict