Cleaned up conflicts I believe. Ben - please check. Thanks!