Conflicts sat fixes

Check length