some minor changes in the merge files