fixed the bugs in villagersScreen|manigann,sneha
conflicts resolved|manigann,sneha