transaction modals
merge conflicts