JSDoc cleanup + added merge method