Performed a proper merge