Redoing changes to SamplerState after merge erased some