manual merge test