resovle merge conflicts