submitreport.html conflict changes