manual merge from upstream to resolve conflicts