Moddify line 1 of test.txt
Moddify 2
Merge confict 1
ADD FILE test.py
ADD file.py
Change file.py
CHange file.py
Conflict resolved
Moddify file.py