fix for faulty merge