added test method
test added conflict fixed