Sa conflict resolution

Blankrequested to merge
Blank/fc-pregmod:saConflictResolution into pregmod-master

Closes #792 (closed).

Edited by Blank

Merge request reports