optimized
minor modifications
gitignore
merge conflicts
repair