fix conplicts