In need of help, Failed to merge kdk

I downloaded the kdk from github, I think I didn't have 2.3.1, and I can't for the life of me figure out what went wrong, past uninstalling 24e247 and installing 24e248. Could someone please help me?