Lots of refactoring, implement conflict resolution in component list, load context from backend