updating scala version
Fixing conflicts
Build settings