Git can merge master and side without conflict but JGit can't