Preparing for Merge
RAW Merge
RAW Merge pt2