Added adam email
conflicts resolved