while
merge
fixed merge