can merge things wooooooooo
test that master reflects our merge commit found