Resolve some merge issues

Authored by davidedmundson on Jan 3 2018, 10:49 AM.