~[Fix]Last merge conflicts resolution