fix confilicts