add merge
merge without ff
merge test