move files to avoid conflicts