Finished merge, missed some files for items