buggy merge code still