have an actual github repository
fixed merge conflicts