readd mistakenly deleted files by a bad merge