extra refreshing manual merge