Restore fix some wrong choices of manual merge