be more specific with the ignored header files
remove merged patches from consolidate-repos.sh