Add new line in the master branch
Fix the conflict
Add haha in the dev