Remove filename from conflict markers