pulling from night 1
resolve conflict
analytics page
resolve conflict