merged and hid missing file so code compiles