git in my branch
using theirs
Some important revise