Update report data loading
Fix code conflicts