Proper merge