resolve merge conflict

- style fix

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -1589,7 +1589,7 @@ Object call(PBuiltinFunction function) {
         }
     }
 
-    @Builtin(name = "PyTruffle_Bytes_EmptyWithCapacity", fixedNumOfArguments = 2)
+    @Builtin(name = "PyTruffle_Bytes_EmptyWithCapacity", fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     abstract static class PyTruffle_Bytes_EmptyWithCapacity extends NativeBuiltin {
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -1579,7 +1579,7 @@ private static String charAtToString(String primary, int index) {
         }
     }
 
-    @Builtin(name = __ITER__, fixedNumOfArguments = 1)
+    @Builtin(name = __ITER__, fixedNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class IterNode extends PythonUnaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ApplyKeywordsNode.java

@@ -101,8 +101,8 @@ Object[] applyCached(Arity calleeArity, Object[] arguments, PKeyword[] keywords,
             if (kwIdx != -1) {
                 if (PArguments.getArgument(combined, kwIdx) != null) {
                     throw raise(PythonErrorType.TypeError, "%s() got multiple values for argument '%s'",
-                            calleeArity.getFunctionName(),
-                            kwArg.getName());
+                                    calleeArity.getFunctionName(),
+                                    kwArg.getName());
                 }
                 PArguments.setArgument(combined, kwIdx, kwArg.getValue());
             } else {