fixed a small commit conflict