All files that must be manually merged are saved in the /manual_merge directory. If you do not see the files on the target machine, you can ignore the need for manual merges.