modified from terminal
merged file 2
Merge remote-tracking branch 'remotes/origin/dev' into dev