fixed merge issue
got fucking transactions