added modal
fixed merge conflict