r2 add hi
mix conflict with master