updated documentation, moved merged attributes method.