added test town
fixed merge
merge test