style fixes
conflict fixed