Fix merge conflicts

diff --cc NEWS
index a4be989bdb22b21806b09aa9d00f4f18ad081df5,f559fd591d89a01e3f3f791942f092d5939bc8e8..0bf870b951bf4625b12f3a47bc08b59b78f262c3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,12 -1,8 +1,17 @@@
 +Changes in 2.2
 +==============
 +
 +* UPD: AppleTalk are disabled by configure script. if use, --enable-ddp.
 +* NEW: afpd: dynamic directoy cache
 +* NEW: afpd: POSIX 1e ACL support
 +* NEW: afpd: automagic Zeroconf registration with avahi, registering both
 +       the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
 +
+ Changes in 2.1.4
+ ================
+ 
+ * FIX: afpd: Downstream fix for FreeBSD PR 148022
+ 
  Changes in 2.1.3
  ================
  

diff --cc VERSION
index eca07e4c1a8cbc603e5d5c2885dc0f0f9b1eef8d,5ed43442e357ec5af98423b346ac65ab92069e04..ed9e076d0649773651d68edf1ecf66b897704894
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 2.1.2
 -2.1.4dev
++2.2dev

diff --cc libatalk/dsi/dsi_tcp.c
Simple merge