this is a test of branch
add sth
master xg
confict fixed