Generalized file conflict resolving tool.