Manually merged