adding configuration to config.py
resolved merge conflict