Browse Conflicts not resolved Conflicts not resolved gtk-no Conflicts resolved Conflicts resolved gtk-yes False Choose Path for Mergetool True False True False 0.47999998927116394 Have conflicts been resolved? True True 0 True False 1 0 True False Cancel True True True actConflictsNotResolved True False False 0 True True True actConflictsResolved True top False False 1 False True 1