Modified File 2
Conflict Resolution