tests added
test fixed
conflict merged