readd file lost in merge