In case you are still reading: Mostly merging. If the file was edited offline at two points, merge these versions.