test branch dev
test git master
conflict fixed