Merging complete...stable version