transaction changes
fixed merge conflict