fixed faulty merge 2