removed the conflicts in the application.html file by replacing it's contents with the previous stable release.