Huzzah for conflict resolution!