Resolve conflict

diff --cc Zend/zend_hash.c
Simple merge

diff --cc Zend/zend_language_scanner.c
Simple merge

diff --cc Zend/zend_portability.h
Simple merge

diff --cc ext/exif/exif.c
Simple merge

diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_wireprotocol.c
Simple merge

diff --cc ext/phar/phar.c
Simple merge

diff --cc ext/standard/browscap.c
Simple merge

diff --cc ext/standard/crypt.c
Simple merge

diff --cc ext/standard/pack.c
Simple merge

diff --cc ext/standard/php_crypt_r.c
Simple merge

diff --cc ext/standard/var_unserializer.re
Simple merge

diff --cc ext/wddx/wddx.c
Simple merge

diff --cc main/php.h
Simple merge

diff --cc main/strlcat.c
Simple merge

diff --cc main/strlcpy.c
Simple merge