added in correct jar
fixing merge conflicts