fix merge, remove linting errors

dist/preview release/what's new.md

@@ -41,13 +41,8 @@
 - Fix picking issue in the Solid Particle System when MultiMaterial is enabled ([jerome](https://github.com/jbousquie))
 - `QuadraticErrorSimplification` was not exported ([RaananW](https://github.com/Raananw)
 - Fix NME Frames bug where collapsing and moving a frame removed the nodes inside ([Kyle Belfort](https://github.com/belfortk)
-<<<<<<< HEAD
-- Remove texture baking from `KHR_texture_transform` serializer. ([drigax](https://github.com/Drigax))
-=======
 - Fix moving / disappearing controls when freezing/unfreezing the ScrollViewer ([Popov72](https://github.com/Popov72)
 - Fix: when using instances, master mesh (if displayed) does not have correct instance buffer values ([Popov72](https://github.com/Popov72)
 - Fix improper baking of transformed textures in `KHR_texture_transform` serializer. ([drigax](https://github.com/Drigax))
->>>>>>> ee255573c14b962e47b0e9c602180d5a8e206c34
-
 
 ## Breaking changes

serializers/src/glTF/2.0/Extensions/KHR_texture_transform.ts

@@ -98,7 +98,7 @@ export class KHR_texture_transform implements IGLTFExporterExtensionV2 {
                 reject(`${context}: "scene" is not defined for Babylon texture ${babylonTexture.name}!`);
                 return;
             }
-            // 
+
             let bakeTextureTransform = false;
 
             /*
@@ -106,7 +106,7 @@ export class KHR_texture_transform implements IGLTFExporterExtensionV2 {
             * the texture must be baked to preserve appearance.
             * see: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_texture_transform#gltf-schema-updates
             */
-            if ( (babylonTexture.uAng !== 0 || babylonTexture.wAng !== 0 || babylonTexture.vAng !== 0) && (babylonTexture.uRotationCenter !== 0 || babylonTexture.vRotationCenter !== 0)) {
+            if ((babylonTexture.uAng !== 0 || babylonTexture.wAng !== 0 || babylonTexture.vAng !== 0) && (babylonTexture.uRotationCenter !== 0 || babylonTexture.vRotationCenter !== 0)) {
                 bakeTextureTransform = true;
             }