Display, but missing jar
Resolved merge conflict