Strange behavior with polygon and NaN

Applying: Fix NaN handling of geometric arithmetics
Using index info to reconstruct a base tree...
A	doc/src/sgml/func.sgml
M	src/backend/utils/adt/geo_ops.c
M	src/include/utils/float.h
M	src/test/regress/expected/create_index.out
M	src/test/regress/expected/geometry.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/geometry.out
Auto-merging src/test/regress/expected/create_index.out
Auto-merging src/include/utils/float.h
Auto-merging src/backend/utils/adt/geo_ops.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/geo_ops.c
CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in Fix NaN handling of geometric arithmetics. Version Fix NaN handling of geometric arithmetics of doc/src/sgml/func.sgml left in tree.
Patch failed at 0001 Fix NaN handling of geometric arithmetics

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"