Attempting to correct another merge conflict