fix conglicts