Looks like you've committed the conf/config.php file and overwritten newer changes pulled from github.