changed url to zen
fixed merge errors