merging diverted versions.