Conflict Resolution?

Trying to make Git and LV play nice.