Your search +path:diff_common +path:conflict did not match any files.
Suggestions:

• Make sure all terms are spelled correctly.
• Try different keywords.
• Try more general keywords.
• Use 'wil*' cards if you are looking for partial match.