proper merge