Fixes merge conflict
Removes contact_us dependancy