fix: contract type collision issues from deleted files and empty file issues

fix: contract type collision issues from deleted files and empty file issues #3634