stuff
deleted conflict in footer

unneccecary script