Restore change lost in merge conflict.