What about these commented lines? Do you really want them to be merged?