Conflict Resolution

Thanks for sharing this Em. This is FABULOUS. Thought I'd share.

I loved this.