add jars
fix conflicts