fix gitignore and main
merge