merge plus changes