Resolv conflict
commit for fix bug