conflict jar冲突