conflict with hadoop added