worked days and reports days
conflict merge