added report
added model again
trying to fix merge errors