update to mrjob default val
fix conflicts