test cases and bugs
merge conflict