Add conflict file JsonObjectWrapper.java