resolving dep conflicts with junit