Version builder and version context
Version and cache working on debug mode
Conflict resolution after merging with dev.