resolve merge conflicts — done, test added

get rid of jgit Git class usages