Merge master and status