resolve merge from foolhardy use of reset