change has commit
merge the conflit
branch test