initial merge of non conflicting files