add aorura21@gmail.com
all conflicts fixed