minor stuff
conflict