Manually merged conflict