repaired head conflicts in views
copied database and changed settings for production