Check-in mistake; manual merge of files