fix libs and merge comment