added third test case
merged conflicted