Trying to resolve conflict
Trying to resolve conflict (+minor api changes)