merging with upstream
enabled all columns in the report