commit test at dev branch
add modify
master modify
conflict fixed