## Git merging with upstream
use the strategy=ours