stuff
updates merge and clients links