test commit for local branch of 'hua'
manual update conflict between two commits of different brances
test branch usage end