c interfaces: pr feedback

and some cleanup

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mpi/c/ineighbor_alltoallw.c

@@ -12,11 +12,7 @@
  * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
-<<<<<<< HEAD:ompi/mpi/c/op_create.c
  * Copyright (c) 2025      Triad National Security, LLC. All rights
-=======
- * Copyright (c) 2024      Triad National Security, LLC. All rights
->>>>>>> c9e2518417 (Generate interfaces for C with bigcount):ompi/mpi/c/op_create.c.in
  *                         reserved.
  * $COPYRIGHT$
  *