few changes
conflict fix