Updated contact page.
Fixed merge conflict.