Update config.php

resolve conflict