pushing my branch2 onto xuchongang's

First try at pushing my branch onto my neighbor's
This is nice but not sure it does not allow the merge