Fixes merge false conflict on update/merge

[kintsoogi]

Describe what your pull request addresses

• [ ] Fixes gEdit issue #528 - merge false conflict on update/merge

Test Instructions

• [ ] Open Deploy Preview
• [ ] Make changes and test update/merge to make sure they do not return false conflicts

[codecov[bot]]

Codecov Report

Merging #538 (10ae431) into release-v2.1.0 (34af947) will increase coverage by 1.23%. The diff coverage is n/a.

@@                Coverage Diff                 @@
##           release-v2.1.0     #538      +/-   ##
==================================================
+ Coverage           51.65%   52.88%   +1.23%     
==================================================
  Files                  43       43              
  Lines                1299     1299              
==================================================
+ Hits                  671      687      +16     
+ Misses                628      612      -16     

see 3 files with indirect coverage changes

:mega: We’re building smart automated test selection to slash your CI/CD build times. Learn more