added the dude
fixed merge conflicts