Add command for grep conflicts in files