Change footer text
Resolve merge conflict