once more test for merge conflits in footer.php
merge conflict resolved on footer.php file