customize gitmergetool
add chromecognito desktop entry