Resolved merge conflict

diff --cc misc/bamcheck.c
index efccf9a112703f7801e5e523598f06ea447f28f7,f61fac18c73ddfb2074e2b7e246dd4ce606a75fb..e5bfb5d0e1db18a0c182349ae0734294451331fc
--- 1/misc/bamcheck.c
--- 2/misc/bamcheck.c
+++ b/misc/bamcheck.c
@@@ -981,9 -1018,7 +1018,7 @@@ void output_stats(stats_t *stats
      }
  }
  
- void bam_init_header_hash(bam_header_t *header);
- 
 -size_t getline(char **line, size_t *n, FILE *fp)
 +size_t mygetline(char **line, size_t *n, FILE *fp)
  {
      if (line == NULL || n == NULL || fp == NULL)
      {