Initial stage
conflict fixed