preparing merge
prepare merge