できた？
あああああああああああ
Merge remote-tracking branch 'origin/master' into aaa
Merge remote-tracking branch 'origin/aaa' into ｗｒｙｙｙｙｙｙ

Conflicts:
	test_2/main.cpp