fix buggy merge