Files updated after conflict
Files updated