*actually* set splice as mergetool :p