Merge conflict BeerDetails.aspx.designer