report fixes
resolving merge conflicts