shifted stuff
resolved conflict