app.json merge=ours

