Conflict model that can parse git conflict markers.