report fix merge