Hmmm, that's strange. In master, the call to `openSearchBar()` has the `scope` variable. But in your branch, it doesn't, and the diff here doesn't show this as a diff from master. If I do a test merge of your branch into master, it looks fine, but it's strange that it didn't get merged correctly into your branch. Maybe that other line was part of the conflict and you resolved it incorrectly? Anyway, I'll go ahead and merge this and just double-check that everything looks okay afterwards.