3.0.0 - breaking API change, conflicts now work as expected across all APIs
3.0.0