Merge conflict
Add a new passwd