conflict
newFile
mod newFile
Merge branch 'master' of github.com:takehiro224/mybox