Add Conflict2Diff
vim > *
Ignore composer stuff