Merge with main repo versions