new testing for merge conflicts in footer.php