#!/bin/bash
git fetch origin master
git merge -s ours origin/master