Fixed classpath error
Fixed duplicates/merge errors