Conflict case of changed local file changed to reality