conflict resolved
changed nscala to jodatime