add web interface
conflict resolved