Fix unexpected merge