Index Just about error free, temporarily excluded tests from the project for easier building
Merge resolution