More tests for conflict resolution