add test
fixed merge