virgin repo
resolved .gitignore merge conflicts