redid the application
merged the wrong files