fix conflicts for gd and gmp
This tag has no release notes.