Checking gitignore fix
Fixed merge error on global.php