Add footer color
Clear merge error on app scss file