Update expectations to remove conflict
Created attachment 105316 [details] Patch
Committed r93855: <http://trac.webkit.org/changeset/93855>