Try to merge all files together again