sidetap initial
conflict fix