more links added
conflict fixed