blah
resolving merge
removed rdoc log