worked on org page.
fix conflict.