fix conflict

diff --cc ext/gd/libgd/gd_interpolation.c
index e1c87282fd081d8420b1545b1ea204a8cffd1e0b,15b541571567a3fafec0a14f65724fe0b4725dd9..77d7dd154350c0ed1e352f7cd494527bd730145d
--- 1/ext/gd/libgd/gd_interpolation.c
--- 2/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@@ -2220,7 -2207,7 +2221,8 @@@ gdImagePtr gdImageRotateInterpolated(co
                        break;
  
                default:
 +                      gdImageRotateGeneric(src, angle, bgcolor);
+                       return gdImageRotateGeneric(src, angle, bgcolor);
        }
        return NULL;
  }