move versus set conflict corrected