working reset
mergefix