add test
edit pang
merge fix