minor changes
Fixed conflict
test