WIP: Added a conflict warning and the ability to proceed/discard the match.