@jasondegraw Ok, so if it is a merge issue, I should just fix it in the OpenStudio branch?