Increase the footer top margin length
resolve the merge conflicts