merege local and repo versions on misc