merge for the new year