alcopolis laptop
conflict resolved