merge now takes into account parent fields