added another modal
Added remove
Fixed a conflict:3