Choosing the files
resolving conflict