added modals
fixing conflicts