add modal window
merge resolved DS_STORE