Hello, this is a test for conflicting GitHub files. Testing testing Edited in GitHub This is in VS Code Conflict Test