remove ternary, empty default handled by merge