another merge error fixed