Show a message (yellow banner style) on top of the old interface about the possibility to have the new interface.
"An updated interface for solving edit conflicts is now available. Enable the Two Column Edit Conflict View in your [[preferences (link to user's Editing preferences section)]] to try it out."
- Show the message to all users using the old interface
- Allow the user to dismiss this message (E.g. via a cookie)