I've tried both of them...I think I will just start over and see if it fixes itself somehow...most of my villagers have died anyway.