Just before create branch for redesigning merge functions