fix a small conflict from cross-editing