Update import-export-images-and-conflicts patch