notes to self
conflict resolve