commit grpo and gr
commit resolved conflict