fix merge error in items controller