add a shortcut to search for merge conflicts