Merge Changes | Thomas Stermole