comments update following phone call
some updates
conflict