doing shop things
merge conflicts