fix conflicts in BWAMEMSpark.scala