Merge conflict + json build