manually merging updates since last repo commit