Include jar, running version
Fix conflicts