fixed white line bug in footer
Resolved conflicts