4 ms·Blerg. There should be asterisks around that italicized conflict word.by pcl 7y agoBlerg. There should be asterisks around that italicized conflict word.jlgaddis 7y agofind .git/ -name '*conflict*' There ya go.