Fixed merge problems
Delted keys.json