merging the two repo, compiling, not tested