Fixed files after merge
   modified:   src/dynamo/dynamo/globals/cells.cpp
   modified:   src/dynamo/dynamo/interactions/PRIME_BB.cpp
   modified:   src/dynamo/dynamo/interactions/squarewell.cpp