Removed old versioned builds
fixed merge conflicts