Use the vcs script and some tweaks
merge