manually merged