reverted changed lost in the merge