Local report changes
Report conflict fixed