Update functions.php

Cleaning up merge