Merge with old branch (encryption)