footer additions
resolve merge conflicts