commit author state
a1b2c3 alice merged
