fix: correct merge logic for conditional rules

[backjo]

this PR fixes a few bugs in the conditional rule logic for fields that can be merged, notably:

1. On 'merge' fields, the conditional value was being merged into the resource value before the default value was merged. This would cause the default value to take priority over the conditional value, which was not intended.
2. On 'merge' fields, the conditional value was not being set if a conflict was not present.
3. On 'mergeOverride' fields, the conditional value was replacing the default value. Now, it is merged with the default value, with the conditional value taking priority.

It also allows the userData field to be merged on the name key.

[codecov]

Codecov Report

Merging #287 (d7367d5) into master (06da69c) will decrease coverage by 0.04%.
The diff coverage is 69.23%.

@@            Coverage Diff             @@
##           master     #287      +/-   ##
==========================================
- Coverage   70.23%   70.19%   -0.05%     
==========================================
  Files          19       19              
  Lines        2970     2979       +9     
==========================================
+ Hits         2086     2091       +5     
- Misses        755      758       +3     
- Partials      129      130       +1     

Impacted Files	Coverage Δ
controllers/provisioners/config.go	77.10% <69.23%> (-1.24%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 06da69c...d7367d5. Read the comment docs.