fix + merge ITKG