merging two files almost complete