Fix footer
Resolte config merge