refactoring - merge, doc