Stripped jQuery noConflict
kitt.yml
Merge conflict