Report adjusted.
Fixed merge conflicts.