Fixed path. Set relative path in config.php. Modified git ignore to point at the new config location.
Fixed merge conflict