fix faulty merge commit