Test manual merge