fix conlicts