add modal box
merge conflict