new file conflict
resolve with mine
new file conflict