new file modified
conflict resolved