hopefully fix merge mess

git diff looks correct, so should be fine... sorry!