working versio merging