We need to refactor conflict link to work better with the new flow:

• Make it actual link
• Provide separate entry options
• Provide 2 step processing