made changes in villager and mafia screen|manigann,sneha
fixed conflicts|manigann,sneha