fix recent merge