Change conflict tab from an unordered list.

Change conflict tab from an unordered list to a div and mive it to the
right section of the app.