Resolved a merge conflict with a method name change.
Resolved a merge conflict with a method name change.

SasView/sasview,SasView/sasview,SasView/sasview,SasView/sasview,SasView/sasview,SasView/sasview