contact-us removed
conflict resolved