Hi "Hello from the other-side" -- resolving a merge conflict #Are we really doing that "new changes to branch" "added from remote - local"