Fix mismerge camera files