add -u explaination
more info on -u
Merge branch 'init'
resolved conflict