Unfortunately it looks like you merged the wrong way. See commit 39cb024d210d9369c363192ef6d916cf6b4adfb6 on 15th March.