fix_missing_files

Something went wrong while merging branches, some of the files went
missing