Latest updates, resolve scala conflicts