resloves merge conflicts