merge issue
admin instructor, photo upload and merge conflicts