Proper merge. All features recovered.