merge of conflicts in run regression