fix update not merging on good branch