Conflicts sat fixes

Make the name more descriptive