comment out time reports
resolve merge conflict between master and performance