small changes
conflict fix...