Modified the JAR conflict