Gh375 - merge branch

add mergeResult.getConflicts() also