Fixing conflicting versions