reportschanges
conflicts resolved