[FOLD] Fixed conflicts private member data