Manual merge of modifications done in the old repository