First try to merge the two files