fixed continuous looop for transactions
fixed merge conflict