first september changes
conflict fixed