mindmap added
conflicts resolved