Fixes faulty merge