move conflicting files