commit after checkout aaa
merge message