Merge statement by Shawn Demarest

Merge statement