removed threesome as mergetool