Matching up local and master