Improved conflict file creation

UUID of the created conflict file is set to null to prevent conflict file from being
detected as a renaming.