Assign tastings--resolved merge conflict