more work on new intro
merge + manual merge gitignore