Merge Guillermo's bwa specfile