Move things from feed/ott to feed/misc
Repair merge