...
Commit after having changed email to cynosure.veda@gmail.com
resolved conflict