Transaction conflicts fixed