[git][merge] fix hasConflict function
[git][merge] adding --no-rerere option