Removed conflict markers from the test file
Fixed the example projects to compile again. No guaranteest they actually work