about us partials
resolved conflict