merged the two files into one