added reports
resolved conflicts