Prepare location to merge with master