adding missing files from merge