Fix merge conflict

Author: rtucek

CHANGELOG.md

@@ -1,3 +1,10 @@
+##### Tag v0.4.1 (2017-03-28)
+[![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/rtucek/nginx-php:v0.4.1.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.1 "Get your own commit badge on microbadger.com")
+
+- Bump PHP to v7.1.3
+- Bump Nginx version to v1.11.11
+- Add commit SHA1 badge
+
 ##### Tag v0.4.0 (2017-02-14)
 [![](https://images.microbadger.com/badges/image/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/rtucek/nginx-php:v0.4.0.svg)](https://microbadger.com/images/rtucek/nginx-php:v0.4.0 "Get your own commit badge on microbadger.com")
 

Dockerfile

@@ -13,8 +13,8 @@ LABEL \
     org.label-schema.version=${VERSION}
 
 ENV \
-    NGINX_VERSION=1.11.11 \
-    PHP_VERSION=7.1.2 \
+    NGINX_VERSION=1.11.13 \
+    PHP_VERSION=7.1.4 \
     XDEBUG_VERSION=2.5.1 \
     VERSION=${VERSION}