mind map added
conflict fixed