Removed 'we're moving' footer and replaced old address with new.
ran se-compile.
Fixed merge conflict.