Resolve conflicts
API fixes