Fix silly faulty merge