merge both versions