nothing...
merge
resolve conflict
refactoring, finish lib_core