edge case for D partially fixed
fixed merge conflicts