added modal
merge fix