Including merge version