style fixes
conflict fix