Which version did you want to use for merging in the end? The proposed one, the old one or something else?