Reversed sides of original and replacement in file conflict dialog

Fixes #5094