fixed faulty merge