fix buggy merge some more