You can merge both version changed