Summary report table creation added (conflicts only)
Several model improvements