Unify dependency version after merge