Conflicts sat fixes