Update cdh4 version; resolve conflict