Merging versions after forking