trying to fix IE bugs
ie fix 2
dealing with merge conflict from heroku