fixes ConflictResolver. Ivy imports are less prone to write multiple times now. Fixed scala version in adept plugin - guess I used the wrong value there...