Workspace changes
Correct conflicts
Modify .gitignore