JSON
Dealt with conflicts