re-add lost files from merge