merging with file two