Resolve merge conflict caused by accidental checkin of wrong initializers.generated file