add new image modal
Conflicts resolved