Fix another unresolved merge