Diff Checker

Upload two files of the same type and choose which values to keep for each conflict, similar to a merge resolver.