ENH: git conflict fixed, cmakelist as extension