daily reports
conflict resolved