(hopefully) fix merge mess

git diff looks good...