merge takemura