resolved tmx merge conflict