Fix another merge conflict.