more merge conflict testing on footer.php