fix merge issue

Signed-off-by: Colin Patrick McCabe <cmccabe@cloudera.com>