Implement merge_over method for CompItem class

Required for overwriting escaped strings with either another escaped
string or a scalar. As CompItem objects render as strings the merge_over
method is the same as for ScalarItem objects
2 files changed