Moving conflicting files