Merge Conflict

Finally Released: 3-Column Merge Editor in VS Code!

The biggest drawback of using VS Code compared to WebStorm has been solved.