add basic test case
remove unused function comment
fix conflict