Fixing compile error caused by faulty merge