AND simple added
master also change
conflict fixed