manual merge of conflicting files