I mixed something up in conflicted versions, recommit from ftp