working modals
merge