[quote=@FacePunch]
Huzzah for conflict resolution!
[/quote]

Huh?