merge new feature