Resolved conflict with Beam3DInFull3DModel

Beam3DInFull3DModel matches the master branch
25d40a8e63b94f0f6b39e7983b19a9aae741fc23