new shinjuku
merge confrict