dev modify
dev1 modify
master modify
fix conflict
dev1 modify2
no-ff merge dev1
master modify1