Fixed my screwups in going through the conflicts