fix merge bug

amdis/BiLinearForm.inc.hpp

@@ -74,7 +74,7 @@ assemble()
   this->init();
   for (auto const& element : elements(this->rowBasis().gridView(), typename Traits::PartitionSet{})) {
     rowLocalView.bind(element);
-    if (this->rowBasis() == this->colBasis())
+    if (this->rowBasis_ == this->colBasis_)
       this->assemble(rowLocalView, rowLocalView);
     else {
       colLocalView.bind(element);