Deleted conflicted file JsonObjectWrapper.java