thursday afternoon
conflict fixed