before pull
resolve conflict
sucessful scalapack run