Merge Client changes local to github