Second try on merging