put back in pretty printing and merging
update