really fix poorly-fixed merge conflict