added universal header
fixed merge conflicts with partials merge