review comments - move merging to tool chest