another city chang
conflicts resolved