Too many merges

Author: anakinj

lib/jwt/encode.rb

@@ -38,7 +38,7 @@ def encoded_header_and_payload
     end
 
     def encode_header
-      encode_data(@headers.merge(@algorithm.header(signing_key: @key).merge))
+      encode_data(@headers.merge(@algorithm.header(signing_key: @key)))
     end
 
     def encode_payload