did not realize there was a pull
merge conflicts
yep
moar merges
missed merge conflict