Water conservation order in Atchison lifted, emergency order remains