fixed conflict stash