Resolving MR Conflicts with GitKraken