merging in infochimps changes