manually merged conflicts