replaced files to restore changes to original state
resolved conflict with footer