branch test
feature1 add a line
master add a line
solve conflict
deve add a line
merge dev
master fix a bug
dev finish job
fix conflick