edited homepage.
merge conflict.