made the modal close
merged conflicts in index