lost merge 2.25 file