Back to vintage mode
Revert .gitignore
Fixed conflict