Fix interface definition
Resolve conflict