merge with pcmdgit