consolidated dup files in diff templates