The unlink in handle conflict file was not correct