preparing merge