Properly pass through the observer when a conflict is being resolved.

We were calling delete on the query builder which was ignoring the observer.