merge
another merge
remove global.json