Add new line in the dev branch
Add new line in the master branch
Fix the conflict
Add haha in the dev
Merge from dev
Ci