transaction seed improved
merge conflict solved