resolve tree conflicts with master

Signed-off-by: Ayane Satomi <chinodesuuu@gmail.com>