merge
add ignored files
do all files
these don't exist