Merge master to mine