Apply doc changes lost in merge