Message that a pull request has conflicts should be more prominent

[jennings]

As far as I can tell the only place where you can see this is at the bottom of the page. It should be somewhere near the top, and it should be visible on the home screen.