fixed association error
fix deprecation error
Resolve conflict