Added fuzzy branch to diff and merge