Just moved a file.
Performed manual merge of files from Picard.