re-arrange contact page html
fix conflict