more additions to cukes
merging
Adding mergetool locally
changes on my branch
changing the mergetool file
merging