fix merge changes
Merge pull request #46 from aedwards12/modals_modal

fix merge changes