merge_child_edits.rb needs to handle timestamp updates

[andreiamatuni]

After the column from get_child.rb has been edited, it needs to be merged back under the assumption that the timestamps might have also been edited. So merging using a timestamp lookup and field copy of the original column will not work.