binserver
conflict fix