file to test merge conflicts
try to make conflict
fixed all the conflicts
conflicting conflicts
fixed all the conflicts, really I did