changes to footer.php file, testing merge conflict