>< bad-handled git conflict