friday eod
conflict fixed