Fix a merge pb