More merge errors. During cleanup media moved, therefore during merge media/coco needed to be moved as well.