Fixes faulty merge.