manual merge of the files across dove and macair